From: Gert Wollny <gw.fossdev@gmail.com>
Date: Mon, 6 Mar 2017 10:52:09 +0000 (+0000)
Subject: merge conflicts in upstream
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~26^2~11
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d433845f998060b2d62892b384365fe9eae6cca8;p=dcmtk.git

merge conflicts in upstream
---

d433845f998060b2d62892b384365fe9eae6cca8
diff --cc dcmnet/libsrc/dstorscu.cc
index 4cd7acf6,c93f1756..a8863fb1
--- a/dcmnet/libsrc/dstorscu.cc
+++ b/dcmnet/libsrc/dstorscu.cc
@@@ -927,8 -927,10 +927,10 @@@ OFCondition DcmStorageSCU::sendSOPInsta
  }
  
  
 -void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry &transferEntry)
 +void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry & /*transferEntry*/)
  {
+     // avoid compiler warning
+     (void)transferEntry;
      // do nothing in the default implementation
  }